GtkPopoverMenu: be more careful about change notification
authorMatthias Clasen <mclasen@redhat.com>
Wed, 19 Nov 2014 08:26:25 +0000 (09:26 +0100)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 20 Nov 2014 02:14:30 +0000 (21:14 -0500)
Only emit notify for ::visible-submenu when the visible page
in the stack actually changed.

gtk/gtkpopovermenu.c

index 4d6ecded415ea86fed5facf61b34b50076338630..458884423613d4cef02dcc0310f899a19a7eaaf8 100644 (file)
@@ -113,6 +113,14 @@ enum {
 
 G_DEFINE_TYPE (GtkPopoverMenu, gtk_popover_menu, GTK_TYPE_POPOVER)
 
+static void
+visible_submenu_changed (GObject        *object,
+                         GParamSpec     *pspec,
+                         GtkPopoverMenu *popover)
+{
+  g_object_notify (G_OBJECT (popover), "visible-submenu");
+}
+
 static void
 gtk_popover_menu_init (GtkPopoverMenu *popover)
 {
@@ -123,6 +131,8 @@ gtk_popover_menu_init (GtkPopoverMenu *popover)
   gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT);
   gtk_widget_show (stack);
   gtk_container_add (GTK_CONTAINER (popover), stack);
+  g_signal_connect (stack, "notify::visible-child-name",
+                    G_CALLBACK (visible_submenu_changed), popover);
 }
 
 static void
@@ -410,5 +420,4 @@ gtk_popover_menu_open_submenu (GtkPopoverMenu *popover,
 
   stack = gtk_bin_get_child (GTK_BIN (popover));
   gtk_stack_set_visible_child_name (GTK_STACK (stack), name);
-  g_object_notify (G_OBJECT (popover), "visible-submenu");
 }